From 86dbeabc40d3a25a8552cc446e804c0051be6396 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 18 Nov 2001 02:15:52 +0000 Subject: [PATCH] Include glib-object.h instead of gobject/gsignal.h Sat Nov 17 21:07:46 2001 Owen Taylor * gtk/gtkenums.h: Include glib-object.h instead of gobject/gsignal.h * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen argument to the window_at_pointer() field of GdkPointerHooks. (Patch from Erwann Chenede) * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up to 6 pointers. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-0 | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ gdk/gdkdrawable.h | 2 ++ gdk/gdkinternals.h | 3 ++- gdk/gdkwindow.c | 2 +- gdk/gdkwindow.h | 7 ++++++- gdk/linux-fb/gdkwindow-fb.c | 5 +++-- gdk/win32/gdkwindow-win32.c | 5 +++-- gdk/x11/gdkwindow-x11.c | 5 +++-- tests/testgtk.c | 10 +++++----- 15 files changed, 116 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94422610e2..66411c3dff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Sat Nov 17 21:07:46 2001 Owen Taylor + + * gtk/gtkenums.h: Include glib-object.h instead of + gobject/gsignal.h + + * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], + x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen + argument to the window_at_pointer() field of + GdkPointerHooks. (Patch from Erwann Chenede) + + * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up + to 6 pointers. + 2001-11-17 Matt Wilson * gtk/gtkenums.h: must include glib-object.h only diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 94422610e2..66411c3dff 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +Sat Nov 17 21:07:46 2001 Owen Taylor + + * gtk/gtkenums.h: Include glib-object.h instead of + gobject/gsignal.h + + * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], + x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen + argument to the window_at_pointer() field of + GdkPointerHooks. (Patch from Erwann Chenede) + + * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up + to 6 pointers. + 2001-11-17 Matt Wilson * gtk/gtkenums.h: must include glib-object.h only diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 94422610e2..66411c3dff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Sat Nov 17 21:07:46 2001 Owen Taylor + + * gtk/gtkenums.h: Include glib-object.h instead of + gobject/gsignal.h + + * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], + x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen + argument to the window_at_pointer() field of + GdkPointerHooks. (Patch from Erwann Chenede) + + * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up + to 6 pointers. + 2001-11-17 Matt Wilson * gtk/gtkenums.h: must include glib-object.h only diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 94422610e2..66411c3dff 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Sat Nov 17 21:07:46 2001 Owen Taylor + + * gtk/gtkenums.h: Include glib-object.h instead of + gobject/gsignal.h + + * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], + x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen + argument to the window_at_pointer() field of + GdkPointerHooks. (Patch from Erwann Chenede) + + * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up + to 6 pointers. + 2001-11-17 Matt Wilson * gtk/gtkenums.h: must include glib-object.h only diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 94422610e2..66411c3dff 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Sat Nov 17 21:07:46 2001 Owen Taylor + + * gtk/gtkenums.h: Include glib-object.h instead of + gobject/gsignal.h + + * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], + x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen + argument to the window_at_pointer() field of + GdkPointerHooks. (Patch from Erwann Chenede) + + * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up + to 6 pointers. + 2001-11-17 Matt Wilson * gtk/gtkenums.h: must include glib-object.h only diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 94422610e2..66411c3dff 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Sat Nov 17 21:07:46 2001 Owen Taylor + + * gtk/gtkenums.h: Include glib-object.h instead of + gobject/gsignal.h + + * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], + x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen + argument to the window_at_pointer() field of + GdkPointerHooks. (Patch from Erwann Chenede) + + * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up + to 6 pointers. + 2001-11-17 Matt Wilson * gtk/gtkenums.h: must include glib-object.h only diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 94422610e2..66411c3dff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Sat Nov 17 21:07:46 2001 Owen Taylor + + * gtk/gtkenums.h: Include glib-object.h instead of + gobject/gsignal.h + + * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch], + x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen + argument to the window_at_pointer() field of + GdkPointerHooks. (Patch from Erwann Chenede) + + * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up + to 6 pointers. + 2001-11-17 Matt Wilson * gtk/gtkenums.h: must include glib-object.h only diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index edaf700392..9a529c83ab 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -135,6 +135,8 @@ struct _GdkDrawableClass void (*_gdk_reserved2) (void); void (*_gdk_reserved3) (void); void (*_gdk_reserved4) (void); + void (*_gdk_reserved5) (void); + void (*_gdk_reserved6) (void); }; GType gdk_drawable_get_type (void); diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 47f72645de..8a70873f18 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -195,7 +195,8 @@ void _gdk_windowing_window_clear_area_e (GdkWindow *window, gint width, gint height); -GdkWindow* _gdk_windowing_window_at_pointer (gint *win_x, +GdkWindow* _gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, gint *win_y); GdkWindow* _gdk_windowing_window_get_pointer (GdkWindow *window, gint *x, diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 06b4951a6b..e166165140 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -2637,7 +2637,7 @@ GdkWindow* gdk_window_at_pointer (gint *win_x, gint *win_y) { - return current_pointer_hooks->window_at_pointer (win_x, win_y); + return current_pointer_hooks->window_at_pointer (NULL, win_x, win_y); } /** diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index bca2b065d3..eae6d9baae 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -198,13 +198,18 @@ struct _GdkGeometry GdkGravity win_gravity; }; +/* Dummy typedef for placeholder in GdkPointerHooks.window_at_pointer + */ +typedef struct _GdkScreen GdkScreen; + struct _GdkPointerHooks { GdkWindow* (*get_pointer) (GdkWindow *window, gint *x, gint *y, GdkModifierType *mask); - GdkWindow* (*window_at_pointer) (gint *win_x, + GdkWindow* (*window_at_pointer) (GdkScreen *screen, /* unused for now*/ + gint *win_x, gint *win_y); }; diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index afb22550c0..1755fe4857 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/gdk/linux-fb/gdkwindow-fb.c @@ -1686,8 +1686,9 @@ _gdk_windowing_window_get_pointer (GdkWindow *window, } GdkWindow* -_gdk_windowing_window_at_pointer (gint *win_x, - gint *win_y) +_gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, + gint *win_y) { gint rx, ry; GdkWindow *retval = gdk_window_get_pointer (NULL, win_x, win_y, NULL); diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 3543501589..68f88958ff 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -1882,8 +1882,9 @@ _gdk_windowing_window_get_pointer (GdkWindow *window, } GdkWindow* -_gdk_windowing_window_at_pointer (gint *win_x, - gint *win_y) +_gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, + gint *win_y) { GdkWindow *window; POINT point, pointc; diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 49a6636943..ca20fab5d0 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -2397,8 +2397,9 @@ _gdk_windowing_window_get_pointer (GdkWindow *window, } GdkWindow* -_gdk_windowing_window_at_pointer (gint *win_x, - gint *win_y) +_gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, + gint *win_y) { GdkWindow *window; Window root; diff --git a/tests/testgtk.c b/tests/testgtk.c index a429c6becf..8f22c514dc 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -10685,11 +10685,11 @@ layout_expose_handler (GtkWidget *widget, GdkEventExpose *event) layout = GTK_LAYOUT (widget); - imin = (layout->xoffset + event->area.x) / 10; - imax = (layout->xoffset + event->area.x + event->area.width + 9) / 10; + imin = (event->area.x) / 10; + imax = (event->area.x + event->area.width + 9) / 10; - jmin = (layout->yoffset + event->area.y) / 10; - jmax = (layout->yoffset + event->area.y + event->area.height + 9) / 10; + jmin = (event->area.y) / 10; + jmax = (event->area.y + event->area.height + 9) / 10; gdk_window_clear_area (widget->window, event->area.x, event->area.y, @@ -10701,7 +10701,7 @@ layout_expose_handler (GtkWidget *widget, GdkEventExpose *event) gdk_draw_rectangle (layout->bin_window, widget->style->black_gc, TRUE, - 10*i - layout->xoffset, 10*j - layout->yoffset, + 10*i, 10*j, 1+i%10, 1+j%10); return TRUE; -- 2.30.2